Merge branch 'popovers'
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 22 Jan 2014 17:42:29 +0000 (18:42 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Wed, 22 Jan 2014 17:42:29 +0000 (18:42 +0100)

Trivial merge